from trunk
authorKenichi Handa <handa@m17n.org>
Sat, 13 Feb 2010 00:37:27 +0000 (09:37 +0900)
committerKenichi Handa <handa@m17n.org>
Sat, 13 Feb 2010 00:37:27 +0000 (09:37 +0900)

Trivial merge